-
Notifications
You must be signed in to change notification settings - Fork 678
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add CsWinRT projection #9976
base: release/2.8
Are you sure you want to change the base?
Add CsWinRT projection #9976
Conversation
Update to ESRP task V5 which eliminates secret usage. Parameter values to the task can be controlled by this library https://microsoft.visualstudio.com/WinUI/_apps/hub/ms.vss-distributed-task.hub-library?itemType=VariableGroups&view=VariableGroupView&variableGroupId=5612&path=WinUI2-Signing This currently points to WindowsAppSDK's ESRP configuration
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking great! Left a few updates following the latest changes in CsWinRT/tooling 🙂
<ImplicitUsings>enable</ImplicitUsings> | ||
<Nullable>enable</Nullable> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should remove these, especially Nullable
. WinRT doesn't support annotations. #Resolved
<Platform>AnyCPU</Platform> | ||
<UseUwp>true</UseUwp> | ||
<IsAotCompatible>true</IsAotCompatible> | ||
<WindowsSdkPackageVersion>10.0.22621.37-preview</WindowsSdkPackageVersion> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
<WindowsSdkPackageVersion>10.0.22621.37-preview</WindowsSdkPackageVersion> | |
<WindowsSdkPackageVersion>10.0.22621.39</WindowsSdkPackageVersion> | |
``` #Resolved |
<Nullable>enable</Nullable> | ||
<Platform>AnyCPU</Platform> | ||
<UseUwp>true</UseUwp> | ||
<IsAotCompatible>true</IsAotCompatible> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also add
<IsAotCompatible>true</IsAotCompatible> | |
<DisableRuntimeMarshalling>true</DisableRuntimeMarshalling> | |
``` #Resolved |
</PropertyGroup> | ||
|
||
<ItemGroup> | ||
<PackageReference Include="Microsoft.Windows.CSWinRT" Version="2.1.1" /> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
<PackageReference Include="Microsoft.Windows.CSWinRT" Version="2.1.1" /> | |
<PackageReference Include="Microsoft.Windows.CSWinRT" Version="2.1.3" /> | |
``` #Resolved |
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2739.15"> | ||
<IncludeAssets>none</IncludeAssets> | ||
</PackageReference> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: can make this a one liner
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2739.15"> | |
<IncludeAssets>none</IncludeAssets> | |
</PackageReference> | |
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2739.15" IncludeAssets="none" /> | |
``` #Resolved |
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework> | ||
<Platform>AnyCPU</Platform> | ||
<UseUwp>true</UseUwp> | ||
<DisableRuntimeMarshalling>true</DisableRuntimeMarshalling> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wait, you also need IsAotCompatible
😅
I just meant delete the first two, not that one too, my bad. #Resolved
@@ -28,6 +28,8 @@ | |||
<file target="lib\uap10.0\Microsoft.UI.Xaml\Themes" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\Microsoft.UI.Xaml\Generic.xaml"/> | |||
<file target="lib\uap10.0\Design" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\Microsoft.UI.Xaml.Design\Microsoft.UI.Xaml.design.dll"/> | |||
|
|||
<file target="lib\net8.0-windows10.0.22621.0\Microsoft.UI.Xaml.Projection.dll" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\Microsoft.UI.Xaml.Projection\Microsoft.UI.Xaml.Projection.dll" /> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need to pack a few more things here. This is what the package looks like now:
We also need:
- The Generic.xaml file, in the same subfolder but under the new TFM
- The generated .xml file for the projections .dll
Not entirely sure what that Design.dll file is? Is it for the XAML Designer? I assume we need that one too?
No description provided.